d660e2f95961c1f681c218dafc40183a4c1e6ecb,src/uk/sipperfly/ui/BackgroundWorker.java,BackgroundWorker,doInBackground,#,146

Before Change


					this.parent.UpdateResult("Preparing to send notification email(s)...", 0);
					Logger.getLogger(GACOM).log(Level.INFO, "Preparing to send notification email(s)...");
					SendMail(target);
					if (this.isCancelled()) {
						Logger.getLogger(GACOM).log(Level.INFO, "Canceling send notification email(s)");
						return 1;
					}

After Change


				if (this.isCancelled()) {
					Logger.getLogger(GACOM).log(Level.INFO, "Canceling Transfer Files task.");
					Logger.getLogger(GACOM).log(Level.INFO, "Transfer canceled.");
					this.parent.UpdateResult("Transfer canceled.", 0);
					return -1;
				}
				// bagit
				this.parent.UpdateResult("Preparing Bag...", 0);
				Logger.getLogger(GACOM).log(Level.INFO, "Preparing Bag...");
				BagFolder();
				if (this.isCancelled()) {
					Logger.getLogger(GACOM).log(Level.INFO, "Canceling Bagit task.");
					return -1;
				}
				this.parent.btnCancel.setVisible(false);
				if (this.parent.ftpDelivery.isSelected()) {
					if (this.isCancelled()) {
						Logger.getLogger(GACOM).log(Level.INFO, "Canceling Upload data to FTP");
						return -1;
					}
					if (!ValidateFTPCredentials()) {
						this.parent.UpdateResult("Credentials not valid. Please update FTP Settings.", 0);
						Logger.getLogger(GACOM).log(Level.SEVERE, "Credentials not valid. Please update FTP settings.");
						return -1;

					}

					this.parent.jProgressBar2.setValue(this.parent.totalFiles + 1);
					if (this.isCancelled()) {
						Logger.getLogger(GACOM).log(Level.INFO, "Canceling Upload data to FTP");
						return -1;
					}

					this.parent.UpdateResult("Uploading data on FTP ...", 0);
					Logger.getLogger(GACOM).log(Level.INFO, "Uploading data on FTP ...");
					UploadFilesFTP();
					this.parent.jProgressBar2.setValue(this.parent.totalFiles + 2);
				}
				if (this.isCancelled()) {
					Logger.getLogger(GACOM).log(Level.INFO, "Canceling send notification email(s).");
					return -1;
				}